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

Change-Id: Ic8bfc4fa62d1c95a607ec002f4eefaf0c1b8656a