am e80c652a: am 2d003a27: am 2310657c: Move support lib to rev 5.

* commit 'e80c652add58f4491ffc4cd2c528a765b6c60975':
  Move support lib to rev 5.