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

Change-Id: Ifef820ab05cf2748a0c5e44c494326057ece059f