am 20bebfe4: am 74b2870a: Merge "Clean out *.prop files due to dex2oat instruction-set flag change."
am 20bebfe4: am 74b2870a: Merge "Clean out *.prop files due to dex2oat instruction-set flag change."

* commit '20bebfe456e82a30e7504e5cb413a413f0b30665':
  Clean out *.prop files due to dex2oat instruction-set flag change.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build