Merge "Switch from java_libs to java_header_libs for sdkext-sdk"