am 7d98d0a0: Merge "Fix crash when launching Activities in \'android\' package" into lmp-dev

* commit '7d98d0a0c57232d5c00b823cf8ff4fa6ff643e06':
  Fix crash when launching Activities in 'android' package