Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"