Merge "Bypass LOCAL_*_REQUIRED_MODULES checks for ONE_SHOT_MAKEFILE"