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

Change-Id: I74d6d0fc293cf4b6522344fe6be1dd9e19496ac1