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

Change-Id: I314de59ebb608645e2b9c70247af2e7511059ede