Merge changes I8f585cfb,I77fcb609

* changes:
  Make some methods static
  Consolidate two MakeAACCodecSpecificData functions