am f6dd9c53: Merge "On-device linking." into honeycomb

* commit 'f6dd9c539c1b18f65674b495cb23bf2df36da7af':
  On-device linking.