Android 3.2 release 1
am b7ea0d41: (-s ours) am 16a8c02e: (-s ours) am 2e9a8b3e: (-s ours) Merge "disable prelinking - do not merge"

* commit 'b7ea0d41e1739f610d1e7bd8e7eb2fe600196a4c':
  disable prelinking - do not merge