Merge "Change libkeymaster3device to vendor:true"