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