Merge "Remove duplicated LOCAL_REQUIRED_MODULES"
am: 1cad25b52f

Change-Id: Ic4b34ed822db893a2c8d8e786679540ef2ddfb07