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

Change-Id: I7918852ff16800f490286d31baa3cd0e03ebff31