Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."