[automerger skipped] Merge "DO NOT MERGE Revert "Revert "Delete unused mk files"""
am: c93b59a8ec -s ours
am skip reason: subject contains skip directive

Change-Id: Ia491fbc43a738288345db59b56dc218407c353cc