Merge "Move the BitmapUtil to com.android.internal package" into tm-dev