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