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

Change-Id: I30e0d161534f30ade08facfb779c35494ac82070