Merge "Make libstagefright_aacenc depend on libbinder"