Merge "Enable BVRA client" am: 61e2b44f26 am: 22cb476b55 am: df2bc469d9
am: 7ce5616ebf

Change-Id: Ia62c2a8e299afad7293addca4a212e9ed0ce4890
tree: f179a5fc59cf49fc8ecd64f2735db768c9c9c8fd
  1. android/