Merge "java_sdk_library: Ensure that stubs library is not installed" am: 17cf0ab3bc am: 786d41db85

Change-Id: Ied771bad433818d035e66dfc2ef6a4188280aff7