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

Change-Id: Ib71490ac084c706b53ae83278f3f8fcd302fc0f2