Revert "Cleanup return type checks with arrays."

This reverts commit 59193a6871c3f55190362742b5e495372a28f47d.

Bug: 28313047
Bug: 199056476

Reason for revert: Braino, missing hard failure.

Change-Id: I6b8e4ce1dfa4f4a7d5eb44dfd496ac1a92ce6f85
3 files changed