Merge "Remove .mk lines that are just setting the default" am: c6bdd166d2 am: 8776bad460
am: 2a0108de20

Change-Id: I631e027c9624dba10c0143c4e683fe5abc18ac16