Revert "Try testing API 21"
Revert "Try testing API 21"

This reverts commit 37d10931d4a3ce0a73a5490c05a68f9f6314dd07.

bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration