Merge commit \'8b452b876b90dcfff1dab9012b65b5e67c4531a4\' into manual_merge_8b452b8
am: 2a9a993af9

* commit '2a9a993af99585af0bce6eca6d92c86370977a27':
  Add String16#contains and strstr16 methods.

Change-Id: Icaa1c7f8d458d6f2651c72b376116e6952be9910