Merge "Read build.prop file when provided in AVD." into idea133