Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev