am 9496945d: (-s ours) am 4e00f1fa: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE

* commit '9496945d0ded76031cb129de65be425cfa971673':
  DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.
  DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW