Merge branch 'oc-dr1-daydream-dev' into goog/qt-dev
am: d1b4c07768

Change-Id: I9ce5c29f5dafd67a0f955be7670c3fc8052e38a6
tree: 7e5d6490153e12fcb07779443f3345a2ebda99c8
  1. vrcore/