Merge "stagefright aacenc: Fix inline asm constraints"