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

Change-Id: I51d36fa24ca70135403659a407cfb9fd64f02bbd