build: Fixups for local buildingChange-Id: I38cc5c0afc57f10a5cae61ca1c72e838c58ba33bSigned-off-by: William A. Kennington III <wak@google.com>