Merge "Hand-edit boot-image-profile.txt to move classes" am: 787e1ce12e am: f5ed99558a
am: a0bbbc886f

Change-Id: I372ae7ade0452626484fca1ac7915503e02ff2dc