Merge changes I243417e1,I2a40fe87

* changes:
  Convert KeyChain robotests to Android.bp
  Use tip-of-tree robolectric