Merge "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES"
am: b6fc0a1cae

Change-Id: I4e082de7606caafb56cd7e9fff51fa571073e635