Refactor keymaster Android.bp
am: f7375d1f12

Change-Id: I2e9ea65dd010c04af414d35bb43e9420acf5197c