Merge "Pass cpu/memory to instance during creating AVD."
am: abe76d1606

Change-Id: I57d5e7e2b3056c19d6e66a4343e7bca515b1193c