[automerger skipped] Audio VTS: Fix MMAP tests am: a4b693f5da am: 8c6d6912ba
am: 85411216ca -s ours
am skip reason: change_id I93e66b12c93c466d661e65c4dbbb5deb32772848 with SHA1 a70e4317e6 is in history

Change-Id: Ie8561d89fe61c75a4e798cee64a2321993006d8b