Merge "AAPT: mipmaps should not end up in Splits" into lmp-dev