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

Change-Id: Id49fe6eafbea7d837743240a90dd730367694377