am 6f8df6a2: (-s ours) am b3afbbe5: (-s ours) am ecad92df: (-s ours) DO NOT MERGE ANYWHERE. update support library from build 1828919.

* commit '6f8df6a21cb3210694fca2b317ab7d22e9458ca4':
  DO NOT MERGE ANYWHERE. update support library from build 1828919.