Merge "Set libavb version into system property for Treble OTA"