Merge "Remove .mk lines that are just setting the default" am: 5dfcde90 am: 4722f509 am: 7002f37b am: 938cea4f Change-Id: I63636be0dc7182e2968841af3985d5d021b212ab