Merge "ashmemd: add TEST_MAPPING"
am: dc0fc79c74

Change-Id: I0eefc4f70f0c1ff6fb61baaf378af13b370e25d8