Merge "DO NOT MERGE Revert "Revert "Delete unused mk files""" into stage-aosp-master