Merge "Set java_version:1.8 for Android stubs jar generation"
am: ac031893f4

Change-Id: If8ad5942d9b9406f94fcdd4fc38d8e59b2eba013