am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native"

* commit '24d8fa739b7ca0791174af260ed95cdc139e0903':
  frameworks/base: move idmap from frameworks/native