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

* commit '1dfbd76bf3bb91ccfdf95ee318d59b7cac1063c6':