Merge "Update VNDK version for common graphics HALs."