Change dependencies to allow building 4.4

Change-Id: I123268aac8d998cda80c343af17eb15f5201400a