Merge "Making the emulator respect user-specified data partition size for API 19+" into studio-1.4-dev
automerge: dd6391c

* commit 'dd6391c5eb6f0773de608800517d324c120f3a3d':
  Making the emulator respect user-specified data partition size for API 19+