Prefer artist over album artist.

E.g. when playing a compilation title, one very likely wants to see the real
artist instead of 'Various artists'.

Change-Id: Ie200f2f8b0b90d3470c2e2e4ca6f91f9b117fb1f
Allow adjusting progress on touch events.

Change-Id: Ide0a7ae057a62f3631a32eeaa63f3e04dec5bf54
Re-add auto brightness configuration UI (1/2)

- Add a button into the new brightness dialog that allows opening the
  auto brightness setup
- Enable auto-brightness adjustment (setting for general brighter/darker
  adjustment) and twilight adjustment

Change-Id: I7fd11ddaa112396dcb7508692aacb93bfe3da256
Merge "Prefer artist over album artist." into cm-10.2
Merge "Allow adjusting progress on touch events." into cm-10.2
Merge "Re-add auto brightness configuration UI (1/2)" into cm-10.2
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2