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

Change-Id: Id7de391cb1d74861d8e2d9a818a800e0f7c9f8fc