Merge "ART: Remove obsolete option -Xpatchoat:." am: 797801c258 am: 265340655c
am: 01517860aa

Change-Id: If0de9035953d40a76053b7e048dc37a1b2318435