Merge "Reflect move of mapping file to /system."
am: a74635d33e

Change-Id: Idf88cf223deb529faef0f805e5dc301e5ff92172