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

* commit 'dc3561df118a17a099285c9be312fb66f91314ec':
  frameworks/base: move idmap from frameworks/native