Merge "Fix some paths (in comments) pointing to old locations of C++ Binder interfaces."