Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer"

                                Word16 *minScfCalculated,

                                Flag    restartOnSuccess)

{

	Word32 sfbLast, sfbAct, sfbNext, scfAct, scfMin;

	Word16 sfbLast, sfbAct, sfbNext, scfAct, scfMin;

	Word16 *scfLast, *scfNext;

	Word32 sfbPeOld, sfbPeNew;

	Word32 sfbDistNew;