Merge "ashmemd: add VTS configs" am: be630b72b0
am: 768e1bc76d

Change-Id: I69dc795db12a51568a6a22a16868187e23e21a52