Merge "Add property contexts for dex2oat cpu-set properties"