Delete CRX logic (moving to downstream chrome-app-harness.git)
Merge branch 'upstream'
Revert "Delete CRX logic (moving to downstream chrome-app-harness.git)"

This reverts commit c29e06c340c619064c169ae97aaf8cd17ea4147d.