Merge "Convert keystore-engine to Android.bp"
am: d9145375c8

Change-Id: I13ea3435d244ac4f0e983e54e76ad2cb588291f6