Merge "Bypass LOCAL_*_REQUIRED_MODULES checks for ONE_SHOT_MAKEFILE"
am: 6ae7967309

Change-Id: I357836bb2291caf33101a1cfb2189a1000310e88