Merge "Move a few modules to Soong." am: d408a865af am: 47be7bcdba
am: 8c749a39bd

Change-Id: I806364c500bd8b66a81bedd95c9d4f867d382867