Merge "Disable on-device linking" into honeycomb