Merge "On-device linking." into honeycomb