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

Change-Id: I284f137d8a9c1971308be68997cdf4d6a39ccfb2