am 74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev

* commit '74a0eb360da012c5a13577a8af33f6b28b0fadf7':
  Avoid unhandled page fault cases on Android Wear