am a07ad890: am 776bfd80: am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev

* commit 'a07ad8901acd0b4c1eeab5e0c44b56b692662a92':
  Sanity check padding/delay values for gapless playback