Merge "fortify: simplify strlen for LLVM's new optimization" am: db5c45b457

Change-Id: I9a954bfdbccdd2e53dd0e88cfb7fe0d8fc80a226