Merge "LOCAL_HOST_REQUIRED_MODULES support"
am: 9ffbc10126

Change-Id: I0156d9f49170011261b74006584d67462296b147