Increase default partition size, and fix data partition size calculation.

There is a (reasonable) demand from android development comunity to increase default
data partition size. It seems that 66MB doesn't match anymore user needs. So, with this
CL default data partition size will be increased to 12MB.

This CL also fixes a bug where data partition size set by the AVD manager has been wrongly
treated as an MB value, while it was a byte value.

Change-Id: I27c456a71299aff42bd4ca573d3660292a7d1d44
diff --git a/android/main.c b/android/main.c
index 2723834..d3e7e8f 100644
--- a/android/main.c
+++ b/android/main.c
@@ -235,7 +235,7 @@
     AConfig*          skinConfig;
     char*             skinPath;
     int               inAndroidBuild;
-    uint64_t          defaultPartitionSize = convertMBToBytes(66);
+    uint64_t          defaultPartitionSize = convertMBToBytes(128);
 
     AndroidOptions  opts[1];
     /* net.shared_net_ip boot property value. */
@@ -729,7 +729,7 @@
         uint64_t     defaultBytes =
                 hw->disk_dataPartition_size == 0 ?
                 defaultPartitionSize :
-                convertMBToBytes(hw->disk_dataPartition_size);
+                hw->disk_dataPartition_size;
         uint64_t     dataBytes;
         const char*  dataPath = hw->disk_dataPartition_initPath;