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

Change-Id: I939ef0924b629d0022d293afaa726c960da25910