am 5cc626bb: Merge "Look at map extensions before /dev/ + ashmem." am: eec5a4e7a4
am: 661863dd42

* commit '661863dd426eba13f948e4caaa60c04ae96815f1':