Merge "Adds back the finalize method on the replaced Paint class." into froyo