Reduce legwork entailed by .mk hunting

Change-Id: Ib428371083ca072b5166c2c11306ab5c384bcc76