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

Change-Id: I482dad8f78c1e7dfd69c7c5276beefe65bbe5df4