DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master

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