am 4c7518e1: am 9a4cdf5c: Merge "Look at map extensions before /dev/ + ashmem." into mnc-dev am: 292ef72cc4
am: d54a10daaf

* commit 'd54a10daafbe7b8e0214f551427fd8245d77b467':