Merge "Add LOCAL_OVERRIDES_MODULES"
am: f1610d82f9

Change-Id: I5af8bf3eb789574aa804403de4d946552c9b9fbd