Merge "hardware/interfaces: Android.mk always -Werror" am: df58de6303
am: 05a7a4da70

Change-Id: I3b6ef3cd6e4b741324f50c76cc910449428e76da