Android CTS 6.0 Release 20 (4120755)
am 33e28809: Merge "Add missing <string.h> include."

* commit '33e2880955ff459f976ae4ffe5aced65e0e25e53':
  Add missing <string.h> include.