Merge "Reflect move of mapping file to /system." am: a74635d33e am: 6f18343656 am: e85e8d58d5
am: 6e79d204d7

Change-Id: I6cc22aa549167d5124bacf98a78b6424f8a30bb1