Merge "Increasing x86 emulator system partition size" into mnc-dev