am 77ee5578: (-s ours) am bcf230fa: (-s ours) am 13dcf4a8: (-s ours) DO NOT MERGE ANYWHERE. update support library from build 1830641

* commit '77ee55789fa1cb707bae0dcbeb24003c03cffc33':
  DO NOT MERGE ANYWHERE. update support library from build 1830641