Merge "Create a vendor build.prop for verifying versions" into lmp-dev