Merge "Use -Werror in development/vndk" am: ea75dc7f40
am: 8a3d530c47

Change-Id: I5b84beeaf6c6c18b2270fd995361dd81cda906c1