Merge "Move keystore to Android.bp." am: 96b00c572e am: eeec1dd470
am: 6807442953  -s ours

Change-Id: Ib656e15a8c7d3ec8b88b97435a0f13532724a2fa