Merge "FastDeploy refactor: 2+GB APK support, optimizations, tests." am: a1d6f4a41c
am: 3f69226b37

Change-Id: I767f3f9c9df592b51529e22d4a1453baf01eea99