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

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