pick up some of my packages for rebuild

Change-Id: Ic1276dc0f4ad582bd9a106b4260b398e3c505788