Merge "Remove apk test until I figure out why it is failing am: cd84f30323 am: be4e209c9c am: fcc9c4f58a am: 72359268cb am: d86597482b am: 8bdf6ed4b6" into nyc-mr2-dev-plus-aosp
am: 030a832ab8

Change-Id: I8a3c26c19a1f4f8f78d73160c28d8ee0fe9a597f