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

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