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

Change-Id: I807e4527f804661d3a4e4deb803c2f5fc16ec8d1