Fix all the things

Change-Id: I43fe64fed31842f97eba1c9c38c2b26238509ebc
Merge remote-tracking branch 'aospa/kitkat' into kitkat