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

Change-Id: Ic23f22a26e160055c2e50eb9641183c0da9dfc2a