Merge "Revert "Delete unused mk files""
am: e222139d8d

Change-Id: I6497560f67d611ebaf26d8f853bdbae52246ea6a