Merge "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES""