Merge "ART: Add a System.getProperty cutout" into nyc-dev