SnapdragonCamera: Fix static library name conflict

A JNI lib is built for both the Camera2 app and SnapdragonCamera
but is included in system/lib. Since this lib has been branched
as well, rename it and explicitly bundle it with the app to avoid
the library name conflict.

Change-Id: I3177d0a99be06cef0b841d8e84e652b8974cadc6
2 files changed