Fix build.
Update support library @ 2533503 from master
BUG=26543888
BUG=26558558

Change-Id: Ib4b8dc5f740da2f7c2b1acc09d67e842883b73aa
19 files changed