am d2ee4960: Merge "Remove Disco video from builds." into jb-dev

* commit 'd2ee4960c492259665adc2c6630e1a59642677b9':
  Remove Disco video from builds.