Merge "LayoutLib: improve bitmap support."