Android n mr1 preview 1
Merge "Backport: Work around a type inference change in javac" am: a728081e33
am: 859d9ed5b3

* commit '859d9ed5b3fc1b26c2b79bf7b3a956d7d492971b':
  Backport: Work around a type inference change in javac

Change-Id: I20dc71c79ac17115f1993d1c6c22fdab7fb92a07