Merge commit 'refs/changes/42/2258242/1' of sso://googleplex-android/platform/hardware/libhardware into merge
am: d123e361cf  -s ours

Change-Id: I8fe59820d5141eed91653ec46d3ada7d72762a0c