Merge "Fix the vendor api level"