Merge "Convert several libraries to soong." am: 3b680bb63e am: 087a92d552
am: e27390725c

Change-Id: I29902a81c198e62a703c03adc77f324542f1a4f0