am 9f1fb17d: am 1dfbd76b: (-s ours) am 4a6807bb: Merge "Sanity check padding/delay values for gapless playback" into mnc-dev

* commit '9f1fb17df293ac80d32eaff4a53c73f7154c8952':