Merge "Fix issue preventing aapt from stripping all unwanted densities" into lmp-preview-dev