Glacier: Update dependencies

Change-Id: I0a6bd1766a4213228ec80af2c891a07f6ccec773
Merge "Glacier: Update dependencies" into jellybean