Merge "Move keystore to Android.bp."
am: 96b00c572e

Change-Id: I5a82d97d5c94f0cc5f6535bf20df8db77e54238a