Merge "Convert keystore-engine to Android.bp"