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

* commit '0839ba9a609002a4b29290a55caa125e363e629e':
  Backport: Work around a type inference change in javac

Change-Id: I1c5229fdb8b66ee064ccfe33dc5c36c69f1d0a7c