am 035a7b02: am 0626ec58: Merge "Frameworks/base: Wall Werror in core/jni"

* commit '035a7b0235835e856f39623fc571668e2d6048da':
  Frameworks/base: Wall Werror in core/jni