Restore some mk files for easier merges

Change-Id: Ia4af4e067be8cf78cd6a075699d42f15d72f8cab