Merge "convert to Soong, static library" am: 168a87ba95 am: 7ee71735df
am: e1c4f45c70

Change-Id: I49687b52e314ff90d5d5d5a3f48c6c761bd96fde