Merge changes Ieb58dd9a,I8ada38df

* changes:
  AVB: support BOARD_BUILD_SYSTEM_ROOT_IMAGE
  AVB: support signing vendor.img