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

Change-Id: I32b29b3db7080eb2084b2f5c63f8b4b812a3b0e8