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

* commit '56259594da620757e95172ef6ff68cade501da51':
  Move support lib to rev 6.