Merge "Expose system and test stubs from java_sdk_library_import" am: 89d7b00d42 am: a177f8700a

Change-Id: I12a0d1eb2ef7f24f295c0452f32c45c56839c7df