Merge "Add knowledge of mipmap to aapt"