Merge "vendor: update forked list" into android-10