am 2d42dc74: Merge "Valid APK paths now include expanded storage."

* commit '2d42dc74e9b647345a5d4ba79bcdadbf700002e2':
  Valid APK paths now include expanded storage.