Merge "Clean up ArraySlice<>."
am: aebfd208a5

Change-Id: I3273d89d1f4beb1b4de3532aaa5fec407c652691