am 69164f04: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."

* commit '69164f045f62741460fcb4308025fcefa49fe38a':
  Lose HAVE_ANDROID_OS from hardware/libhardware.