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

Change-Id: Iad553437753e78131e34da89bb61a2b75ac4f796