Fix lockring, navring, and device tunables fc

Derps from common fixes commit that was merged yesterday

Change-Id: Ia47c6f354e1b8d3fac54f20fa45954f935901111

Conflicts:
	Android.mk
	AndroidManifest.xml