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

Change-Id: I218693aa77266178f2635140f76d82e36d7d489c