Merge "LOCAL_REQUIRED_MODULES accepts module names, not file names." into jb-dev