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

Change-Id: Ie2140538f4145841a6338364d282175da1c6041e