Refactor keymaster Android.bp am: f7375d1f12 am: e33190ca66

Change-Id: I3b1ade0b1944fe85621f24c00745671211bf74ce