[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
am: 306bad0089  -s ours

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