Update missing stuff to 4.4.3, fixing build with it

Change-Id: Ida57676d7300e47cf1cd4fee12bbf15e50112316