Re-order CAR and OAR in patches since OAR overwrites audio frame bitstream metadata...