am b0d0e260: resolved conflicts for merge of 2baeb898 to honeycomb-plus-aosp

* commit 'b0d0e260bd6118959fa0e2d3c84037b3e0178551':
  Fold uevent message origin checking from init into libcutils.