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

Change-Id: I51d8ba247b78d202c25a773c0aca3c23a08c24d5