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

Change-Id: I9fd45ec3ef397c3a240249a96cda20521fe865e7