am 74befadd: Merge "Fix NotificationCompat.MediaStyle crash on ICS" into lmp-mr1-ub-dev

* commit '74befadd5ca79be67563a42c41ccc4e19797e379':
  Fix NotificationCompat.MediaStyle crash on ICS