Merge "Add support for LOCAL_MODULE_SYMLINKS"