Merge "Add test config to mmapPerf" am: a2f6b2fe17
am: e988c3ee6a

Change-Id: I33354a1899d4206387f08e7ced39d5717a0ee090