Merge "Revert "Fix aapt dump for APKs with no resources"" into lmp-dev