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

Change-Id: I1b3a573a7e4e6828d2193782f32e10f86e16947f