keymaster: Fix make file and loading keymaster app

Fix make file issues resulting in failing to build the right
version of keystore.

Change-Id: I949666d59f93828d047ee26db2eb068da1233e87

Conflicts:
	Android.mk