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

* commit 'faf88e2d9d7af6bcc906e38a03da58df095d8419':
  On-device linking.