Merge "ashmemd: add TEST_MAPPING" am: dc0fc79c74
am: 6e165439ae

Change-Id: Ia9a84759221dbb11108424ec18bd483faeb87e3b