Merge "LayoutLib: Replace custom BitmapFactory by a simpler delegate" into honeycomb