Merge "[MP3] Fix wrong private_bits in side info" am: 14c577fac8 am: 25427e247d
am: 7a1d258c8b

Change-Id: Ifeb8cd956fa896d2bf07660972f09e7641c7f844