Merge commit '8b569c8d49924d849793513a5418ef0350320962' * commit '8b569c8d49924d849793513a5418ef0350320962': Fix aapt dump badging to support xlarge screens.
Merge commit '8b569c8d49924d849793513a5418ef0350320962' * commit '8b569c8d49924d849793513a5418ef0350320962': Fix aapt dump badging to support xlarge screens.