Merge "fortify: remove `pragma diagnostic error` from tests"
am: 14d5c12ed6

Change-Id: I98b676f22c717c2ad4e2fdb8911bc6d6a5843cfe