Merge "Remove duplicated LOCAL_REQUIRED_MODULES" am: 1cad25b52f am: cf0e210dd3
am: 80812d1c17

Change-Id: I67107a4025b549fa26d112713c7be4335e351f56