am b37b312b: am 7d86b454: Merge "frameworks/native: move idmap to frameworks/base"

* commit 'b37b312b829c7ab5107c2f96d0a95a557f67a831':
  frameworks/native: move idmap to frameworks/base