Merge "Use -Werror in cts/.../Anroid.mk"