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

Change-Id: I52715725873a62978e9b38548741d6c50ac51eeb