Merge remote-tracking branch 'goog/pi-dev.bak'

Bug: 111553225
Change-Id: I0ab39d3fd841b7b1f676fec3b8063786033a3232
tree: a5af3160f02b278d9efc168e10b0f2b15bb3ffbe
  1. Android.mk
  2. vr-845.c
  3. vr-8998.c
  4. vr.c
  5. vr_int.h