Merge "Fix for Hidden API Landroid/widget/ImageView;->mDrawMatrix:Landroid/graphics/Matrix; in ligt-grey list"