am 53973805: am 56259594: Merge "Move support lib to rev 6." into ics-mr1

* commit '5397380528fdbb80e32094d1313d8ee308f8528c':
  Move support lib to rev 6.