Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev