Merge "Use -Werror in prebuilts/ndk" am: 6c19f6ceea am: a5b5071563
am: d2486fafef

Change-Id: I8f035058d8e7cd84cd3ff1101d08513329fec5ef