Merge \\\"simpleperf: adjust mapped buffer size in record command.\\\" am: e5b5cf07c7 am: 7d14996202
am: 259a42912c

Change-Id: I0b725df71e12bdcf4bcd37b3ab55becc0b0cae6d