Changes to allow for dynamically shared library

Change-Id: I4e7f2224fbda5231b21612faa8094c7fa54d2cb9

Conflicts:
	Android.mk
Merge remote-tracking branch 'cm/cm-10.2' into HEAD