Merge "A few fixes to AssetManager2 for compat"