Merge "DO NOT MERGE: sphal is another linkernamespace that is available to JNI libs" into oc-dev am: 0a844c6aba
am: 12195de49b  -s ours

Change-Id: Ib2afd6a0abf5bc39632dc86cac6891414af54262