am 189bf056: Merge "Frameworks/base: Fix more warnings"

* commit '189bf05616b854f0319c7329a96e63ad374fd6c0':
  Frameworks/base: Fix more warnings