Merge "Add ApkVerityBuilder to contruct the verity tree"