Merge "New implementation of AssetManager/ResTable"