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

* commit '3944b784e980b5e2cad69b2c8eb5dbc7c1fafc4a':
  LayoutLib: Replace custom BitmapFactory by a simpler delegate