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

Change-Id: I6a11933023b4a3ed467b98cc998fa858a7b89fa2