Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"