Merge "Remove redundant setupLibraries call" into stage-aosp-tm-ts-dev