No NDK library w/ vendor variant.
am: baab7f452e

Change-Id: I046e0194ccf27f9f15c984ffc08372803a372d01