Merge commit \'541c86be19166970f20df3cdcc1ab668932ebd31\' into manual_merge_541c86be19
am: bb91801842

* commit 'bb91801842fcfb00781c9577a26f11330f1ff679':
  Disabling tests which depend on a non-NDK shared library.