[automerger skipped] Merge "DO NOT MERGE Revert "Revert "Delete unused mk files""" into stage-aosp-master am: 5b2a7590de -s ours
am: ce1f637d7d

Change-Id: Ib5689f985684faf767bce52036f0371ba7562cbb