Updated makefile.am to compile upstream jni

Change-Id: Ibf3813cf24c33a19bac0ee7641706bdcc5ca7759
Added CLEANFILES to Makefile.am

Change-Id: I822a849784d74329da1e93c696fc6166b495c8f6