Add things other optional things might look for, to make sure everything builds sanely

Change-Id: I1a5437bfac21798c048461a7078992ec5668a6af