Merge "DO NOT MERGE: Discontinue the vectordrawable support lib for this branch." into lmp-mr1-dev-plus-aosp