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

Change-Id: I4a1915bc56bae77d418798669d7b1c213b626d7d