Reflect move of mapping file to /system. am: 39ffec779a
am: 620ec3bd5b

Change-Id: I0bfcccfdfbb5e6d066e3f2c9322e36341601fedf