Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"