Merge "AudioFormat: java-native conversion for xHE-AAC" into pi-dev