Merge "Use Soong to build to etc modules."
am: 91a331e07f

Change-Id: I35bf34314a088eeb1bfb5757cd7bc0954e879a36