Merge "Update allocation from bitmap. GL attribute cleanup in type."