Merge "Clean out *.prop files due to dex2oat instruction-set flag change."