Revert "mark more hals as optional in frozen matrix."

This reverts commit cc4ed2ff3f5735f1d79578621deffc7531dedc9d.

Reason for revert: This change is a workaround. Here's a fix aosp/1473437

Change-Id: I39a76660f11c0a8ca5979bbee4983c13608ff4fd
1 file changed