Merge \\"Simpleperf: adjust default mmap_pages for system wide profiling.\\" am: b2fae142fb
am: 7d8c686f23

Change-Id: Icbb019b43cb981c0694f3dc4b2f3c2cd4dc09ee8