Merge "Replace strlen with arraysize in array bounds."
am: 70a5f12045

Change-Id: I3357cadb32858a94d94c6b4bd82fe69f241027b4