Merge "Don't set PROPERTY_HIGH_DEF_AUDIO in certain cases" into nyc-mr1-dev