tree 68586f4fd910c3b08a9608d7be5e186c9df572c6
parent 40862333af87365ca96d0b830be6e4d49d6072f0
parent 9f80b7e1e77e1d82d421b36ca700ef0eb0c5ceb1
author Eugene Susla <eugenesusla@google.com> 1565608298 -0700
committer android-build-merger <android-build-merger@google.com> 1565608298 -0700

Pull commits from upstream for java 11 compatibility!
am: 9f80b7e1e7

Change-Id: Iad341e501d862dd58436f54f7f73d1d08f152fab