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

Change-Id: If8b81d41d14733c1484b70a173117da467c15094