Merge "Support signing custom images with AVB HASH or AVB HASHTREE" am: fe7aeb1de7
am: 16b64cbb58

Change-Id: I67b3fa64f13d08ee3e4232547d08f6d91e2676d7