Merge "Add basic tests for ashmem" am: a2d4a6b598
am: 46d2e20ba6

Change-Id: Ib47512bc7f3a11481913768641d17ab88baf70c5