[automerger skipped] Revert "Allow compilations in TOCTOU tests to fail with GENERAL_FAILURE." am: 3dca799497 am: fa0a1d16bc -s ours

am skip reason: Change-Id Ifdf4a8fab129cd90a3be019c3c598d980b785aaa with SHA-1 81fa7605cf is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1351585

Change-Id: I9a0a0a8f1aa492ca67a39d213b22cc43fc8e7ff7