Merge changes Ic87a736b,I5bc9f541

* changes:
  Change file permission of checkvintf binary
  Allow specifying null vbmeta.img for production system.img