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

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