Merge "frameworks/base: move idmap from frameworks/native"