Merge "Remove .mk lines that are just setting the default"
am: 8873c3821d

Change-Id: Ic3a02567b2983da067cccc9ce38a2e29ef3834b6