Merge "Remove base_intermediates from LOCAL_C_INCLUDES"