am fbb26f51: am fc42e16d: Merge "Fix track selection code in AwesomePlayer" into jb-dev

* commit 'fbb26f5101d9ef14251d561dba37f87d001fbbf6':
  Fix track selection code in AwesomePlayer