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

Change-Id: I8686371490d33820be555afc5a691c8b39018c4f