Merge "Remove unnecessary include of RSInfo.h"