am 078717be: Merge "Disable on-device linking" into honeycomb

* commit '078717be074e4f68b9af37d70ecbd63702b2be6c':
  Disable on-device linking