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

Change-Id: I5be21ec1f2861915c1a650e6adefbb160eb8f854