Merge "have a per-module switch to turn the symlinking optimizaiton off" am: eb9b9f23 am: 67a0970d Change-Id: Ic867f4a1b7f4d3e59bc67c94f0bd6c423ae9d490