Merge "Replaced android.dvr.composer@1.0 with android.frameworks.vr.composer@1.0" into oc-dev
am: f4c0009bf9

Change-Id: Ifa5785c6a718313408abf8b333e6978e2989a058