am 6fdf6b22: Merge "Fixing Intrinsic dimensions of FastBitmapDrawable" into ub-now-porkchop

* commit '6fdf6b22a75cbbd1728aca9e5305b4f68ef99c18':
  Fixing Intrinsic dimensions of FastBitmapDrawable