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

Change-Id: I24bd59700cd8b362691115e725cbf11e6accdedc