Merge "Add new products aosp_x86_ab and aosp_x86_64_ab" into oc-mr1-dev