Rename jni libs back to their original names

Change-Id: I1a800b87b624c36dcd0d951ef79942929237b5ed
6 files changed