Merge "Add intDef for the return value of AvSettings.getAudio/VideoStreamType"