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

Change-Id: I914be8c01acd6f7af777e7fdb21d915b5599c5e1