Merge "Add "libapexsupport" to dependencies." into main