Merge "Add same_vndk_variants.timestamp to checkbuild"