Merge "Fix VectorDrawable CTS test by putting the parser at the right position" into lmp-dev