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

Change-Id: I7619792205d35d56a9ea4526a764d75a4216df34