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