DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I4f95a724133615db8b050a824e5cbcb11214d89d
tree: d3310d428d7a4cef640acff4ac7d072a2502678d
  1. Android.mk-
  2. vr-845.c
  3. vr-8998.c
  4. vr.c
  5. vr_int.h