Merge "libbase: remove ARRAYSIZE_UNSAFE." am: 120383140e
am: b4e5f58948

Change-Id: I847a5e09c06f7a53e4b2448301793bfa2144e534