[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
am: 267468d777  -s ours

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