Add JNI dependencies for user builds

 * JNI libs weren't being built on user builds. Fixit!

Change-Id: Ia5fa6a994c0110ca44d5b87f60563bf7d4aef3e6
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2