am 6a2a7a7c: am 77e4568f: am 6bc523c6: Changes to fix build warnings on newer versions of GCC, and a fix to not try to open certain mapped files.

* commit '6a2a7a7c5c2895e3ff405a8a77c414ee2cf44181':