Merge "fortify(strings): emit diagnostics regardless of API level" am: 822beaeeac
am: 32afb989c2

Change-Id: Ic98aaff18b30b4c94be28806d2d4d4e368803b97