Merge "Move OatWriter to ClassAccessor" am: 8f5992d8c8
am: 6368a58bfc

Change-Id: If5c77bd376b3146f4f2dbda7f92659737423a541