Reconcile jni + Manifest

Change-Id: I632d84a5819a3b0a91ca352df5c35067fdfb79e1
Signed-off-by: DHOMD <DHO@dho.im>