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

* commit 'e042791e753d35d7fd60f0a9a2b5764dc8d9afac':
  Frameworks/base: Remove unused header