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

Change-Id: I9dc7e9dad7f661643c964ac4d307b4ad1169845e