Merge "Move keystore to Android.bp."