Merge "AndroidBoot: Enable VB_ATTEST and OSVERSION flags"