Merge "Declare mmapped_bytes only if needed" am: a3751c5b2b
am: cced3ba700

Change-Id: Iecff9bc3f136a30201369cd73c7c4c5a57d99b8c