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

Change-Id: Ib93c44743facbe9c60e4ce5b78bbba3e91621ffd