Merge "Fix LOCAL_JAR_PROCESSOR dependency"