am e830df33: (-s ours) am 69164f04: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."

* commit 'e830df33e9028e33137b425401e78d00e456aea2':