Merge "stagefright aacenc: Fix an inline asm constraint"