Merge "Hand-edit boot-image-profile.txt to move classes"