Merge "stagefright aacenc: Mark codeWord as UWord16"