Merge "fortify: inline #defined strings"
am: 32e8d4fa71

Change-Id: Iefcd07d72e691f1399468687bc236d032c521173