DO NOT MERGE ANYWHERE.

Update support library @ 2322615 from mnc-ub-dev. Almost-RC!

Change-Id: I2629e6b7c8fce66f448126550b75b67a2bc21821
24 files changed