Merge "Remove mk file parser variables that are no longer required by system/bt"