Merge "Fix NewApi errors in support libraries"