Merge "java_sdk_library: Allow api dir to be specified" am: 7e96dac325 am: 7da6648137

Change-Id: I65d0c7a2e5ba43d183256b1375596dde6b461b87