Merge "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES"" am: 7d607a1917
am: 0b42833ae3

Change-Id: I9a535f635da245473130345643e1e0b0250885df