Merge "hardware/interfaces: Android.mk always -Werror"