Merge \"Create OatFileAssistant::OatFileInfo inner class.\"
am: 3d733104c9

Change-Id: Iddfadebb0b90ea9ce8376a5a52ec8fc7c2e386f5