Merge "Re-enable CFI test for compressed symbols." am: 04ca0a728d
am: 37c3c073e0

* commit '37c3c073e0cc3f2902eb5e82f7bb832a7315d23b':
  Re-enable CFI test for compressed symbols.