Merge "Add new products aosp_x86_a and aosp_x86_64_a"