am e9e52a2a: am 41cdc4c7: Merge "Revert "Fix aapt dump for APKs with no resources"" into lmp-dev

* commit 'e9e52a2ae2e80286447767b9a83b04d88c41c112':
  Revert "Fix aapt dump for APKs with no resources"