some more junk
-pull my build and vendor

Change-Id: Id591d40e1df17176c78f96c317dffc737e374ebe
make it candy 2/3

Change-Id: I24928259d7618025369eaf57a23f3c8fd8db5591
forgot to update this

Change-Id: I28dc67be89d99415c5134b6790e108af339f9976