Merge "Include the LOCAL_REQUIRED_MODULES when packaging."
am: 06f3258694

Change-Id: I2b8a1e6b0898de266e5da5d0a2ee210540e97f81