Merge "Move api build rules under subdirs"