am 5b50cd13: Merge "Frameworks/base: Fix build"

* commit '5b50cd13688e0a71991b5335d3a28189e1906a2c':
  Frameworks/base: Fix build