[automerger skipped] Refactor keymaster Android.bp am: f7375d1f12 am: e33190ca66 am: a62df5aad2 -s ours
am skip reason: Change-Id I09cfc5291e9616b0509b0cf130519cc8597ccb41 with SHA-1 ba624df9e5 is in history

Change-Id: I6726c6933cffbfbfdecc27d76e07ac7d7ab078d4