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

Change-Id: I050e493b16ea38e011b6c7ec7142bad0c7ab1886