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

* commit '01de243263d347f2ac13a239d67d41817e34df33':
  frameworks/base: move idmap from frameworks/native