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

Change-Id: I6a4bfaec5f2fea463efc2a950b33fc466ab50b24