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

Change-Id: I2565efeafb39004baa936eae71f29bd9160b3507