Merge "unhide AllocationAdapter APIs"