Merge "Fix incorrect includes of AudioTrack.h"