am 735470d2: (-s ours) am 23cad6eb: Merge "stagefright aacenc: Fix reading out...
am 735470d2: (-s ours) am 23cad6eb: Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy"
* commit '735470d2':
stagefright aacenc: Fix reading out of bounds in pow2_xy