Merge "AudioFocusRequest: longer code sample, javadoc fixes" into oc-dev