Merge "stagefright aacenc: Fix inline asm"