am 0da1cbaa: am e042791e: Merge "Frameworks/base: Remove unused header"

* commit '0da1cbaaabbe85e140dabf3fa2b289431c9d3910':
  Frameworks/base: Remove unused header