Merge "Use -Werror in external/smali"
am: e272d2a876

Change-Id: I8798885f431ddaa11562cc8442474c2f43ff7b1b