Fix some merge build derps

Change-Id: I60f7be0b78934b3a991c5bca513d8900eb25667e