Merge "Use -Werror in frameworks/native/libs" am: b6dabc8819 am: a1ff1045a0 am: de5c8a55e5
am: 1e6380e84d

Change-Id: I8510318912bdd097f73e21351cb0801289023442